* reverting changes from appcompat experiment