Revert f71a787..4cca884

This rolls back to commit f71a787fe0f717af30762a695ae4e07a743877af.