Revert 76ee96e..53ec3a7

This rolls back to commit 76ee96ede5ec18eebdbdcdf13da7dfc16028d066.