Revert a97855b..b8c058e

This rolls back to commit a97855bb05d47f28db3dcd8d34b1f7c969b98793.