Accidental overriding fixed

Accidentally removing changes made by Shika (2014/02/24 9:55AM) which
have now been added back.