Revert 6d15ffe..8dd475d

This rolls back to commit 6d15ffe7cd08561445773a9aed93556fb3ad1a63.