Revert 7dc56bc..5da7aa0

This rolls back to commit 7dc56bc20129b5df8b217765a397ce62765ed8b7.