Revert ba1a25e..d2ac0bc

This rolls back to commit ba1a25e9e03a138daccfc48f81ec2ba9853d2317.