Revert 17d2460..b1b31ef

This rolls back to commit 17d246021be6da89b27f4f427f35d93a58e60046.