Revert hack avoiding reply form position bug