Revert 9348b87..5a59b22

This rolls back to commit 9348b87d7008d90df1bff92b6417ffa871d97b2e.