Moved rewrite to master.