Revert 3838dd6..7ed79d7

This rolls back to commit 3838dd672c1a84651b21a33dbf022f6ac6e875ac.