Reverted previous hacky change since it's not really conclusive.