Revert "Upstream javitasa."

This reverts commit bdcfd4851ebe53c80d67727faa750b8d6614fed6.
Upstream javitasa.