Revert 3ee979f..086b99b

This rolls back to commit 3ee979fcb67921b444812a668d7b6595b5aa1caa.
Rollback