This is otherwise very confusing... (cherry picked from commit b8e35011) (cherry picked from commit 51a68d7d)