Revert 47dfb83..ac49eb9

This rolls back to commit 47dfb83bca1c3e2f5aceb1475ce2cf9d11b8ca53.