Reverted sucky, lazy bug addition.