Revert 1b38df8..08bb3eb

This rolls back to commit 1b38df82aabd7af19d40c272c49d18244412082a.