Revert a6877f6..f3392c6

This rolls back to commit a6877f6d2c633754e3a963e24e802a376a0ea348.