Revert 5661ec3..b521ae3

This rolls back to commit 5661ec3031622881829e2bb5da7b62e451f9816d.