Revert cf31630..1182bb0

This rolls back to commit cf316309341a8dc9fbf8743a071211e78323125c.