Revert 47f024d..f38428b

This rolls back to commit 47f024d0a8a10e4de06b4f35f13d327af6291f77.