Revert 45d2ee9..5a3011e

This rolls back to commit 45d2ee9fdde2786c9f69dfcde8f7d72d4acb062e.