Revert 8b39dbf..19ec052

This rolls back to commit 8b39dbf729721f9be156a48f5b2824c12c01f48a.