Revert 42cef4e..e786ba0

This rolls back to commit 42cef4e5ba07310e7dc8f959b729586a00c32e33.