Revert 2e6e7d5..31389e1

This rolls back to commit 2e6e7d5239eec3011c527aa793fef448949a7d64.