Revert a0a96bf..e3a93f3

This rolls back to commit a0a96bf6b36083ffade9ca47aa83a70c489d192f.