Revert 997f6ed..9517f2b

This rolls back to commit 997f6eda96bca4dc84ada3a55e969b9ceeac09ec.