Revert 26b28b5..92618c5

This rolls back to commit 26b28b5d03ff5c45c0e9a36eb02420fdd6c82683.