Revert 4d91c36..da8ddbe

This rolls back to commit 4d91c3610698c9d309149f4118dd2afa4394c774.