Revert 29e3461..fb3e405

This rolls back to commit 29e34612c2babbcb50b61c7ce8a228fe470b0327.