Revert 4e35341..bc07162

This rolls back to commit 4e353416aa2a877bdb1dc99b2f82eaf5f3fceeab.