Revert d2dae2d..b239963

This rolls back to commit d2dae2d88443b024d7b833e17d7bd39bd593b9c8.