Revert 07e7073..a423e3a

This rolls back to commit 07e707368afc5abdd3f1f77389298a97149ce6a6.