Revert 3e69729..4adb143

This rolls back to commit 3e69729dae797ca5977544c407d934826e128645.