Revert 0a8e95c..7a57f72

This rolls back to commit 0a8e95ce199bbfc1a57a9d293c81f3fb128349b9.