Revert c20b695..d4942b6

This rolls back to commit c20b69557fedddf3f05dd7fae893d6b76a55507f.