Revert 69bea48..416341d

This rolls back to commit 69bea481991ec1ac8894a4163608951924baa153.