Revert ea0dacd..9499c78

This rolls back to commit ea0dacd76f4a765e06ea3bc71eec301f2a186f30.