Revert 8d825a5..1c2a65c

This rolls back to commit 8d825a53ac87ff18aeca48f5834cc8fc072733a7.