Revert b68213c..d56085c

This rolls back to commit b68213c759c4d8a8195cb8b915b60fff6ba59524.