Revert 933c1d2..8a2d792

This rolls back to commit 933c1d233c481b993a512722b08e6345ace4017d.