Revert bb848e7..945d074

This rolls back to commit bb848e7e57d7f4be3231317494ca8c3dfb3d025d.