Merge branch 'leon'
Revert 41dacd6..4d08144

This rolls back to commit 41dacd6d61ebd7bfc86f40644b6d26d7fa7ea140.