Reverted the change that I made in #1320.