Revert 06e6132..02673ec

This rolls back to commit 06e61321409002c183365237631a904722ffca03.