Revert 90fec4f..5fb65f2

This rolls back to commit 90fec4fe7a72391442b76133dacea9b241c89da3.