Revert a2adeea..610b542

This rolls back to commit a2adeead264c7bf60113c8571eb4458b2deba3f9.