Revert a3af28f..6fff9f0

This rolls back to commit a3af28f648bccee4a3fb8c44880a6d75e6d2b29c.