Revert changes from 2028bcb