Revert 2c942d5..a3ab677

This rolls back to commit 2c942d5ab8cd1b78234a19c0d4593382d6e1dfb6.