Revert 5be21c4..ab520c2

This rolls back to commit 5be21c4fcee41a56144e3e21de25ddbf5c558a07.