Revert 46a1ddb..83ab299

This rolls back to commit 46a1ddb7cdf457cf3d6a8ccf164383a01c3785e8.