Revert d467131..d264598

This rolls back to commit d4671314a95f2faeaf4dcb8fdf593c7973323cfa.