Revert b1557ce..860e212

This rolls back to commit b1557ced62d6b002ffe956c7416dfd4cefb4f773.