Revert 6d266a9..598eb9b

This rolls back to commit 6d266a9fcf99bd5f71e3bd0b31ffedc09791061c.