Revert d7c86f5..bef7eb8

This rolls back to commit d7c86f5818d9de167bfb8cfb7959757764dee896.