Revert d132d90..4236b93

This rolls back to commit d132d9038fe0517314800379c7ee511b997d1252.