Revert 5b37c4c..abfc8c3

This rolls back to commit 5b37c4cb553fd186ea4fc5e5344bb2963c1db123.