Revert c006156..d2f3576

This rolls back to commit c006156b470a1456764a6f5f7a7be34f589e7426.