Revert 909bc8b..c85fde0

This rolls back to commit 909bc8b02e25861dda372d47354fa10aafea3fad.