Revert b7f948f..b6a616a

This rolls back to commit b7f948f4acb88421cecc8ff03efebb60074ead22.