Revert 1b0dc41..b2808d2

This rolls back to commit 1b0dc4136af766c86ae9d11e3fa3c424fdb73f4b.