Revert a3455b9..1d97eb2

This rolls back to commit a3455b9a7a6228486e72ef52d64a6203d46f1080.