Rewrite for MC 1.6-1.7 - Attempt 1.