Revert 9842e77..2677fa9

This rolls back to commit 9842e77b2daa59f78a9fb2f10277acfc01a2c4b3.