Revert "Lucas' 2013 code"

This reverts commit d5fcdd5916b5ddd89a5a7c5481ac8f9f529df866.