Revert eced43c..a1b085f

This rolls back to commit eced43c65c0f65699a0c137dde72d97e105f9819.