Revert c365b63..f16517d

This rolls back to commit c365b6343b01b5a280d6b7ff704963e762a1d583.