Revert 4230bc8..548ae04

This rolls back to commit 4230bc863b7859f3b14bd5d63af23b6fc46e54bb.