breaking changes due to https://plus.google.com/u/0/107807077849661616002/posts/6duN9hE9v2j advice