Revert 3d1739e..de16481

This rolls back to commit 3d1739ec01320826e307eaae9a81f9a24e6a25d2.