Revert 25b7902..b473acc

This rolls back to commit 25b7902bd3f3d40b9987d3132efe3f4c774f04c0.