Revert 5a3bd37..dcd9f9f

This rolls back to commit 5a3bd373077adcb8a6729430e06961cf0468db07.