Revert 725fb94..f42013c

This rolls back to commit 725fb94ece9ceaddf59ad9c46cb425ab7ee929a1.