Revert ObjectActivity change from a0f9dc3; broke layout