Revert 2353571..0d478db

This rolls back to commit 2353571a875eaccfff2a867dc62b3a0c41753a0d.