Revert 31c39ef..bde3153

This rolls back to commit 31c39ef69f27750225a874a56ea48556db6b7bd3.