When will Spain's golden visa scheme officially end?

Last April, Spain's PM said he would axe the golden visa through real estate investment, but no law has come into force yet. The government's coalition partner has now called for it to happen "immediately", so when will the scheme actually end?