Revert cce718b..bfc7421

This rolls back to commit cce718b48e92e543d24e62aaa70b5a2715e7b6b4.