Revert b044b76..239c0d2

This rolls back to commit b044b764461ad80d2acee4bc128c3ba82aa72ad1.