Reverting #403