Revert a965f7e..931629a

This rolls back to commit a965f7e99156f5518f3cd2e183d4b8b76b0f93a2.