Temporary fix to deal with making queries while the hydrator is activated.

Warning: This is not a proper solution and should be reverted if it is accidentally merged.