Revert 64e6ffb..bf14ea8

This rolls back to commit 64e6ffbd0103d1c90df812addd1eef7e13a4a9b4.