Revert 37dcfa8..c900830

This rolls back to commit 37dcfa8739f4b68eed810895367785d5fd6e99b0.