This commit is a deadend... :( koriym/Ray.Di#61