Revert 8608c90..2155f0a

This rolls back to commit 8608c9064cd850db85957b136ef7615181852abc.