Revert f27d85d..38d1971

This rolls back to commit f27d85d6ff2841bf75f81122ee53ccfe730f29d1.