Revert b4ad463..c086da6

This rolls back to commit b4ad4633dd2285d237655c7e242aca829a40c0e7.