Revert 71f85ed..10aba1a

This rolls back to commit 71f85edbcd82675ccbb69fd60a736f54b2875feb.