Reverting change from revision 1934ef9972f2