Revert bad commit e04b481 for further testing