Reverted two changes per Justin Q