Revert d565926..bb4be1b

This rolls back to commit d5659260dfe34ef680738693405d0a9ad051a8ed.
Merge branch 'master' into macbook