Revert 2209353..336aa5d

This rolls back to commit 2209353a2722db6fe25944f535638150ed34a4e0.