Revert 3364edf..8cb740f

This rolls back to commit 3364edfde5583871946f0e0beeb361d2afaed9a0.