Revert 31dac31..7c00009

This rolls back to commit 31dac31e90a6f5e115b3cc6d6e841246abfbf142.