Revert a1ceefa..1a1e86c

This rolls back to commit a1ceefacda27931f94afa624bbb1d96a588a2217.