Revert 1b39bdb..009545b

This rolls back to commit 1b39bdb6b632e619a14d1acf4789b571e24cf7b0.