Revert 8a24aa7..078ad90

This rolls back to commit 8a24aa737d61b83a745b8bc65e90d82700d36da0.