Revert c8014d9..3e4cc6d

This rolls back to commit c8014d9920284ba70893774a28f179dfe99e2f87.