Revert "More stability fixes for Xcode 6"

This reverts commit f13e2227998a77db1e8c5d5c4842dcdf3afed18a.

The fixes introduced would result in multiple calls to appearance
methods and didn't solve the actual problem.