Revert 2bc4060..dff4902

This rolls back to commit 2bc4060800f007cf7e959d9a6bfe1bbf93bdfc33.