Revert 77dc362..a19cb01

This rolls back to commit 77dc362e810a43afcfe22241f94840427ae19610.