Revert f6201b3..c3c4f24

This rolls back to commit f6201b32ae4eeaa69d52b07bf78296cdd57c4a05.