Revert 1888bee..0a56203

This rolls back to commit 1888bee42bcb65dfb0ebec12e02c185a0a284dfd.