Revert 0a68608..f67513c

This rolls back to commit 0a68608efe89b1688b2229aefe89de04b9495645.