Maintenance for forward compatibility

Tested with WP 3.5.1 and TwentyTwelve