Revert b8f6b09..270b90b

This rolls back to commit b8f6b09cecc224e2811a50d9d9de2dcbede1e9ec.