Implement #15
Revert #15, since it may not actually be needed