Revert 5dad8da..8af03b7

This rolls back to commit 5dad8daad505b664d9c1c0540e5d0e6bf3f614c1.