Revert 9809152..08a8c22

This rolls back to commit 9809152b0ddb77ddfa5cf7a075f87942f1e34695.