Revert 3646b77..f5592bb

This rolls back to commit 3646b77a89f790a01ee2e3470c0f5ed9289a89ea.