Revert hack which should have never been commited.