Back to 3.5.1

Reverting theme from 3.6 beta codebase back to 3.5.1.