Revert 6e3dd57..246ddab

This rolls back to commit 6e3dd571e35fc4b17dfc6c9c786265ffce66e65e.