Remove deprecated hack