Removed no-longer-necessary hack