Removes broken functionality introduced in previous commit