Revert a989880..4fc0a58

This rolls back to commit a989880c276207798e2e140f0bd25476e4bdb361.