Revert 709559b..ad41e74

This rolls back to commit 709559b88bd0a313049e2a485ce72f48b4b414e2.