Revert b02861c..eeea79a

This rolls back to commit b02861c5f62ce8056be2e91afac3d254211fe113.