Revert 83d05fb..33cf0a8

This rolls back to commit 83d05fb3ad473b50b33a8f7c675e5d86abd6a1df.