Revert f4049e5..b9d2e37

This rolls back to commit f4049e5cc89ba85aca4d3e83b58b6430f053e3a6.