Revert 6f612f6..33ca720

This rolls back to commit 6f612f66c5fe30a708be1408ced9ab670f184ab9.