Revert db0beb7..a5958b3

This rolls back to commit db0beb78dd4c29302142602a010b3d5c8cb00e2a.