Revert 4f9e8f5..6fc6ef8

This rolls back to commit 4f9e8f5bd492f8ad9866702a00fc18647b2c7fd9.