Revert 33e42d1..c569834

This rolls back to commit 33e42d1c29c73a1a46bc73f27ef10cb026b9f7af.