Revert 5ff0eb0..148e12b

This rolls back to commit 5ff0eb0b4104c693a58e8e3c9b2a8e233270cd3b.