Revert 957398f..92888cc

This rolls back to commit 957398fe6c6fc602186a3f2dfe0caf4396faa290.