Revert 2ab37cf..3361820

This rolls back to commit 2ab37cf2a211db27812fe25e4ca3b8c2aebac26f.