Revert 3e2819b..5a2b229

This rolls back to commit 3e2819b07fa3c6b9c5b46d3bb610d042b08d6dd1.