revert changes for maverick, and move it to mavericks branch