Removed hack now that master is fixed