Revert 34297d6..ad43c3e

This rolls back to commit 34297d63bbb28774a4a06527093e22652e504635.