Revert of commit 40cf49dae62239b60b49f7a0fdcebcf37bdb3f94