Revert 786e86f..d8c048f

This rolls back to commit 786e86fb491b3d72c6dd0674c379b9fa7c98ffed.