Revert bc36966..9da9ef9

This rolls back to commit bc3696645d2b72c3415f3b383ae585ed929911b0.