Revert 6e0e7bd..b0fac87

This rolls back to commit 6e0e7bdcf8aa22184cc047de6de9656a2828b156.