Revert d05f293..a3a4a39

This rolls back to commit d05f29363f404dc5883a4116d6653ddfa65e7cc0.