Revert to original proposal by ikkez (Issue #570)